fix(aro-hcp): use shared helpers for in-place upgrades by roivaz · Pull Request #83113 · openshift/release

roivaz · 2026-08-07T16:04:45Z

Why

The in-place-upgrade rehearsal for #83084 exposed a pre-existing image override gap unrelated to the ARM-helper identity change.

The baseline at ARO-HCP commit 0767d80 resolved seven Region service images from ACR but omitted customExporter, leaving its static sha256:335a... digest next to commit-specific Backend and Fleet digests. The upgrade phase had the same omission because its override was assembled manually.

The complete workflow image audit found no other missing Region service image. hcpRecovery is intentionally absent from baseline ACR resolution because images-push does not publish it; the upgrade phase already supplies it. oc-mirror and tenant-quota are CI builds, not Region deployment overrides.

What

Replace the duplicated baseline implementation with the ARO-HCP hack/ci/provision-from-main.sh helper.
Build the upgrade override through hack/ci/build-config-override.sh.
Add the pipeline:aro-hcp-exporter dependency to the upgrade step.
Preserve the PR Hypershift operator and shared-ingress images through hypershift-image-overrides.yaml.
Leave the regular aro-hcp-provision-environment path unchanged.

Validation

Regenerated step-registry metadata.
Bash syntax and ShellCheck warning-level checks.
Baseline override test using the real ARO-HCP ACR resolver and override builder, confirming exporter, dual ARM helpers, and intentional absence of hcpRecovery.
Upgrade override test using the real ARO-HCP override builder, confirming exporter, hcpRecovery, Hypershift operator/shared-ingress, and dual ARM helpers.

Summary by CodeRabbit

Updates ARO-HCP in-place upgrade CI configuration to use shared provisioning and override-generation helpers.
Preserves PR Hypershift operator and shared-ingress images during upgrades.
Adds the pipeline:aro-hcp-exporter dependency and supplies the required customExporter override.
Keeps hcpRecovery out of baseline ACR resolution and supplies it only during upgrades.
Regenerates step-registry metadata and validates baseline and upgrade overrides, Bash syntax, and ShellCheck results.

coderabbitai · 2026-08-07T16:05:22Z

Walkthrough

ARO-HCP provisioning now delegates to a shared helper. Local upgrade now requires EXPORTER_IMAGE, preserves selected Hypershift and ingress values, and delegates override generation. The pipeline reference supplies the exporter image and documents the shared helper.

Changes

ARO-HCP helper integration

Layer / File(s)	Summary
Provisioning delegation `ci-operator/step-registry/aro-hcp/provision/from-main/aro-hcp-provision-from-main-commands.sh`	The step replaces its inline provisioning workflow with `hack/ci/provision-from-main.sh`.
Upgrade override wiring `ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-commands.sh`, `ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-ref.yaml`	The step requires `EXPORTER_IMAGE`, preserves Hypershift and shared ingress values, delegates override generation to `build-config-override.sh`, and wires the exporter pipeline dependency. Documentation describes the shared helper.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

openshift/release#82980: Overlaps in the provisioning script and ARM helper lease override handling.
openshift/release#83021: Produces the EXPORTER_IMAGE consumed by the local-upgrade step.
openshift/release#83084: Also modifies the ARO-HCP from-main provisioning workflow.

Suggested reviewers: avollmer-redhat, geoberle

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The patch changes only two shell scripts and one YAML file; it adds or modifies no Ginkgo test titles or dynamic test-name expressions.
Test Structure And Quality	✅ Passed	Not applicable: the PR changes only Bash step scripts and YAML; the diff contains no Ginkgo test code or It/BeforeEach/Eventually/Expect blocks.
Microshift Test Compatibility	✅ Passed	The patch changes only ARO-HCP shell scripts and YAML metadata; it adds no Ginkgo e2e tests or new OpenShift API usage requiring MicroShift checks.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The pull request changes only shell scripts and YAML; it adds no Ginkgo e2e tests, so SNO compatibility checks do not apply.
Topology-Aware Scheduling Compatibility	✅ Passed	The patch changes only CI shell scripts and step metadata; it adds no deployment manifests, operators, controllers, replicas, affinity, topology spread, selectors, tolerations, or PDB constraints.
Ote Binary Stdout Contract	✅ Passed	The PR changes only two shell scripts and one YAML file; it adds no Go/OTE binary or process-level suite code, so this stdout contract check is not applicable.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The commit changes only two shell scripts and one YAML reference; no new Ginkgo declarations, IPv4 literals, or public-network access appear in the changed files.
No-Weak-Crypto	✅ Passed	The 3-file commit adds no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret/token comparisons; checks only file existence and config fields.
Container-Privileges	✅ Passed	Changed ARO-HCP scripts and step reference add no privileged, host namespace, SYS_ADMIN, securityContext, or root execution settings.
No-Sensitive-Data-In-Logs	✅ Passed	Changed scripts add no sensitive logging or tracing; they remove config dumps and digest/registry logs, while Azure login uses --output none and secret values are not passed to echo/printf.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly describes the main change: replacing duplicated ARO-HCP logic with shared helpers for in-place upgrades.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

roivaz · 2026-08-07T16:05:26Z

/pj-rehearse pull-ci-Azure-ARO-HCP-main-e2e-parallel-inplace-upgrade

openshift-merge-bot · 2026-08-07T16:08:01Z

@roivaz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

coderabbitai

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@ci-operator/step-registry/aro-hcp/provision/from-main/aro-hcp-provision-from-main-commands.sh`:
- Line 17: Replace the failing delegation in aro-hcp-provision-from-main with
provisioning logic available in the checked-out tree, or add the required
hack/ci/provision-from-main.sh helper and invoke it reliably. Preserve the
downstream artifact contract by producing ${SHARED_DIR}/config.yaml and
${SHARED_DIR}/aro-hcp-slot.env.

In
`@ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-commands.sh`:
- Around line 77-86: Update the command flow around sourcing
hack/ci/build-config-override.sh so it uses the actual ARO-HCP upstream helper
available in openshift/release, adding or correcting the helper reference as
needed. Ensure the helper runs successfully before copying OVERRIDE_CONFIG_FILE
to config-override-upgrade.yaml and exporting the updated path.

🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 18c5abc7-ee5f-46a8-be8c-b0c934957232

📥 Commits

Reviewing files that changed from the base of the PR and between 88ce08f and 368676e.

📒 Files selected for processing (4)

ci-operator/step-registry/aro-hcp/provision/environment/aro-hcp-provision-environment-commands.sh
ci-operator/step-registry/aro-hcp/provision/from-main/aro-hcp-provision-from-main-commands.sh
ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-commands.sh
ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-ref.yaml

Use the shared ARO-HCP CI helpers for baseline provisioning and upgrade override generation so customExporter and both ARM helper identities stay aligned with ARO-HCP main. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

coderabbitai · 2026-08-07T16:34:49Z

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

roivaz · 2026-08-07T16:35:08Z

/pj-rehearse pull-ci-Azure-ARO-HCP-main-e2e-parallel-inplace-upgrade

openshift-merge-bot · 2026-08-07T16:35:11Z

@roivaz: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

openshift-ci · 2026-08-07T16:35:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roivaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~ci-operator/step-registry/aro-hcp/provision/from-main/OWNERS~~ [roivaz]
~~ci-operator/step-registry/aro-hcp/test/local-upgrade/OWNERS~~ [roivaz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-merge-bot · 2026-08-07T16:37:54Z

[REHEARSALNOTIFIER]
@roivaz: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
pull-ci-Azure-ARO-HCP-main-e2e-parallel-inplace-upgrade	Azure/ARO-HCP	presubmit	Registry content changed
pull-ci-Azure-ARO-HCP-main-upgrade-e2e-parallel	Azure/ARO-HCP	presubmit	Registry content changed

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

openshift-ci · 2026-08-07T18:19:52Z

@roivaz: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/rehearse/Azure/ARO-HCP/main/e2e-parallel-inplace-upgrade	`70f27e8`	link	unknown	`/pj-rehearse pull-ci-Azure-ARO-HCP-main-e2e-parallel-inplace-upgrade`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

roivaz · 2026-08-07T19:12:44Z

/pj-rehearse pull-ci-Azure-ARO-HCP-main-e2e-parallel-inplace-upgrade

openshift-merge-bot · 2026-08-07T19:17:46Z

@roivaz: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

roivaz mentioned this pull request Aug 7, 2026

feat(aro-hcp): use second ARM helper identity #83084

Open

openshift-ci Bot requested review from avollmer-redhat and geoberle August 7, 2026 16:05

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2026

coderabbitai Bot reviewed Aug 7, 2026

View reviewed changes

Comment thread ci-operator/step-registry/aro-hcp/provision/from-main/aro-hcp-provision-from-main-commands.sh

Comment thread ci-operator/step-registry/aro-hcp/test/local-upgrade/aro-hcp-test-local-upgrade-commands.sh

roivaz force-pushed the fix-upgrade-inplace-exporter branch from 368676e to 70f27e8 Compare August 7, 2026 16:34

Navigation Menu

Uh oh!

fix(aro-hcp): use shared helpers for in-place upgrades - #83113

fix(aro-hcp): use shared helpers for in-place upgrades#83113
roivaz wants to merge 1 commit into
openshift:mainfrom
roivaz:fix-upgrade-inplace-exporter

roivaz commented Aug 7, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Aug 7, 2026 •

edited

Loading

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

coderabbitai Bot left a comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai Bot commented Aug 7, 2026

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

openshift-ci Bot commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

openshift-ci Bot commented Aug 7, 2026

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

roivaz commented Aug 7, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why

What

Validation

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai Bot commented Aug 7, 2026

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

openshift-ci Bot commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

openshift-ci Bot commented Aug 7, 2026

Uh oh!

roivaz commented Aug 7, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

roivaz commented Aug 7, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Aug 7, 2026 •

edited

Loading